projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b7bd7e9) | patch
; Fix issues running gitmerge
authorJim Porter <jporterbugs@gmail.com>
Tue, 22 Aug 2023 01:19:24 +0000 (18:19 -0700)
committerJim Porter <jporterbugs@gmail.com>
Tue, 22 Aug 2023 01:22:59 +0000 (18:22 -0700)
commit0df2efa4d6953fb3dbc50c5faa845e80154b447b
treea267efeb67f5d4c1ea87a54724a27ca2ad4aed65tree | snapshot
parentb7bd7e92a969f012c8e6ad8d0cdbffd758054cabcommit | diff
; Fix issues running gitmerge

* .gitattributes: Ignore whitespace issues in java/INSTALL.

* build-aux/git-hooks/pre-commit (git_diff): Explicitly allow
"ChangeLog.android".

* java/README: Remove extra trailing newline.
.gitattributes diff | blob | history
build-aux/git-hooks/pre-commit diff | blob | history
java/README diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.